From: Kenichi Handa <handa@m17n.org>
Date: Wed, 29 Sep 2010 00:55:58 +0000 (+0900)
Subject: merge emacs-23
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~16^2~48
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1dada6f88b23b4d4c9a43313297735a7bffc23f4;p=emacs.git

merge emacs-23
---

1dada6f88b23b4d4c9a43313297735a7bffc23f4
diff --cc src/ChangeLog
index 6c6679abf49,f3060c3aebc..1d5f5baadb0
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,17 +1,22 @@@
 +2010-09-29  Kenichi Handa  <handa@m17n.org>
 +
 +	* xfont.c (xfont_open): Fix setting of font->average_width from
 +	:avgwidth property (Bug#7123).
 +
+ 2010-09-28  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	* dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it
+ 	is more portable.
+ 
+ 	* keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
+ 	(kbd_buffer_get_event): ... here. This is needed for cygwin, which
+ 	has not defined SIGIO.
+ 
+ 2010-09-27  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	* dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
+ 	(Bug#7113)
+ 
  2010-09-26  Jan Djärv  <jan.h.d@swipnet.se>
  
  	* xgselect.c (xg_select): Clear file descriptors not set from